Fix 1441 in 4_4_x - scope and collection not considered in repo delete. #1465
Conversation
This is a more localized change than the one in main. Closes #1464.
| @@ -60,7 +60,7 @@ public class ReactiveCouchbaseRepositoryKeyValueIntegrationTests extends Cluster | |||
|
|
|||
| @Autowired ReactiveUserRepository userRepository; | |||
|
|
|||
| @Autowired ReactiveAirportRepository airportRepository; | |||
| @Autowired ReactiveAirportRepository reactiveAirportRepository; | |||
|
|
|||
There was a problem hiding this comment.
I had to rename the ReactiveAiportRepository to exactly match the bean-name for disambiguation - as the ReactiveAirportRepositoryAnnotated is also a ReactiveAirportRepository.
|
|
||
| @SpringJUnitConfig(Config.class) | ||
| @IgnoreWhen(missesCapabilities = { Capabilities.QUERY, Capabilities.COLLECTIONS }, clusterTypes = ClusterType.MOCKED) |
There was a problem hiding this comment.
the missing @SpringJunitConfig was causing the @Autowired not to work, and requiring a hack in beforeAll()
| this.findOperationWithProjection = findOp; | ||
| this.findOp = (ReactiveFindByQuery<?>) (operations.findByQuery(type).inScope(method.getScope()) | ||
| .inCollection(method.getCollection())); | ||
| this.removeOp = (ReactiveRemoveByQuery<?>) (operations.removeByQuery(type).inScope(method.getScope()) |
There was a problem hiding this comment.
can it be casted to findBy and RemoveBy at the same time?
| @@ -65,6 +67,8 @@ public AbstractCouchbaseQuery(CouchbaseQueryMethod method, CouchbaseOperations o | |||
| ExecutableFindByQuery<?> findOp = operations.findByQuery(type); | |||
| findOp = (ExecutableFindByQuery<?>) (findOp.inScope(method.getScope()).inCollection(method.getCollection())); | |||
| this.findOperationWithProjection = findOp; | |||
| this.removeOp = (ExecutableRemoveByQuery<?>) (operations.removeByQuery(type).inScope(method.getScope()) | |||
There was a problem hiding this comment.
same as comment below, is it possible that not both casts are possible?
There was a problem hiding this comment.
If I understand the comment correctly - both are fine. the first one is operations.findByQuery(), the second is operations.removeByQuery(). I'm actually not sure why a cast is even required - because ExecutableRemoveByQuery (eventually) extends the type returned by withCollection() (RemoveByQueryWithOptions).
| @@ -99,6 +101,15 @@ | |||
| @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) | |||
| Mono<Airport> findByIata(String iata); | |||
|
|
|||
| @Query("#{#n1ql.delete} WHERE #{#n1ql.filter} and iata = $1 #{#n1ql.returning}") | |||
There was a problem hiding this comment.
nit: extra whitespace between and and iata, also below
There was a problem hiding this comment.
Oof. Formatter does not reformat quoted strings!
| @@ -60,7 +60,7 @@ public class ReactiveCouchbaseRepositoryKeyValueIntegrationTests extends Cluster | |||
|
|
|||
| @Autowired ReactiveUserRepository userRepository; | |||
|
|
|||
| @Autowired ReactiveAirportRepository airportRepository; | |||
| @Autowired ReactiveAirportRepository reactiveAirportRepository; | |||
|
|
|||
mikereiche
deleted the
datacouch_1464_fix_1441_in_4_4_x_consider_scope_and_collection_in_repo_delete
branch
This is a more localized change than the one in main.
Closes #1464.